Merge remote-tracking branch 'savannah/master' into wip2
authorAndrea Corallo <akrl@sdf.org>
Thu, 9 Jul 2020 15:42:16 +0000 (16:42 +0100)
committerAndrea Corallo <akrl@sdf.org>
Thu, 9 Jul 2020 15:42:16 +0000 (16:42 +0100)

Trivial merge